Change in openvpn[master]: win: implement --dns option support
A message that is not in the archive (sent off-list or not yet received): gerrit.1733989644000.I576e74f3276362606e9cbd50bb5adbebaaf209cc@...2715...
Attention is currently required from: flichtenheld, plaisthos.
Hello plaisthos, flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
to review the following change.
Change subject: win: implement --dns option support
......................................................................
win: implement --dns option support
Implement support for setting options from --dns. This is hugely different than what we had so far with DNS related --dhcp-option.
The main difference it that we support split DNS and DNSSEC by making use of NRPT (Name Resolution Policy Table). Also OpenVPN tries to keep local DNS resolution working when DNS is redirected into the tunnel. To prevent this from happening we have --block-outside-dns, in case you wonder. Basically we collect domains and name server addresses from network adapters and add so called exclude NRPT rules in addition to the catch all rule that is pushed by the server.
All is done via the interactive service, since modifying all this requires the elevated privileges that the openvpn process hopefully doesn't have.
---
M include/openvpn-msg.h
M src/openvpn/dns.c
M src/openvpn/dns.h
M src/openvpn/init.c
M src/openvpnserv/interactive.c
5 files changed, 1,096 insertions(+), 7 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/37/837/1
include/openvpn-msg.h +19 -0
@@ -35,6 +35,8 @@ msg_del_route, msg_add_dns_cfg, msg_del_dns_cfg, + msg_add_nrpt_cfg, + msg_del_nrpt_cfg, msg_add_nbt_cfg, msg_del_nbt_cfg, msg_flush_neighbors,
@@ -96,6 +98,23 @@inet_address_t addr[4 ];/* support up to 4 dns addresses */ } dns_cfg_message_t; + +typedef enum { + nrpt_dnssec +}nrpt_flags_t ; + +#define NRPT_ADDR_NUM 8/* Max. number of addresses */ +#define NRPT_ADDR_SIZE 48/* Max. address strlen + some */ +typedef char nrpt_address_t [NRPT_ADDR_SIZE ]; +typedef struct { +message_header_t header; +interface_t iface; +nrpt_address_t addresses[NRPT_ADDR_NUM ]; +char resolve_domains[512 ];/* double \0 terminated */ +char search_domains[512 ]; +nrpt_flags_t flags; +}nrpt_dns_cfg_message_t ; + typedef struct { message_header_t header; interface_t iface;
src/openvpn/dns.c +133 -0
148 lines not on this page · raw message
src/openvpn/dns.h +9 -0
@@ -26,6 +26,7 @@#include "buffer.h" #include "env_set.h" +#include "tun.h" enum dns_security {DNS_SECURITY_UNSET ,
@@ -147,6 +148,14 @@void dns_options_postprocess_pull (struct dns_options *o);/** +* Invokes the action associated with bringing DNS up or down +* @param up Boolean to set this call to "up" when true +* @param o Pointer to the program options +* @param tt Pointer to the connection's tuntap struct +*/ +void run_dns_up_down (bool up,struct options *o,const struct tuntap *tt); + +/** * Puts the DNS options into an environment set. * * @param o Pointer to the DNS options to set
src/openvpn/init.c +6 -0
@@ -2008,6 +2008,8 @@ c->c2.frame.tun_mtu, c->c2.es, &c->net_ctx); } +run_dns_up_down (true, &c->options, c->c1.tuntap); +/* run the up script */ run_up_down(c->options.up_script, c->plugins,
@@ -2046,6 +2048,8 @@/* explicitly set the ifconfig_* env vars */ do_ifconfig_setenv (c->c1.tuntap, c->c2.es); +run_dns_up_down (true, &c->options, c->c1.tuntap); +/* run the up script if user specified --up-restart */ if (c->options.up_restart) {
@@ -2134,6 +2138,8 @@ adapter_index = c->c1.tuntap->adapter_index;#endif +run_dns_up_down (false, &c->options, c->c1.tuntap); +if (force || !(c->sig->signal_received ==SIGUSR1 && c->options.persist_tun)) { static_context =NULL ;
src/openvpnserv/interactive.c +929 -7
1,016 lines not on this page · raw message
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I576e74f3276362606e9cbd50bb5adbebaaf209cc
Gerrit-Change-Number: 837
Gerrit-PatchSet: 1
Gerrit-Owner: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newchange
Attention is currently required from: flichtenheld, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
to look at the new patch set (#2).
Change subject: win: implement --dns option support
......................................................................
win: implement --dns option support
Implement support for setting options from --dns. This is hugely different than what we had so far with DNS related --dhcp-option.
The main difference it that we support split DNS and DNSSEC by making use of NRPT (Name Resolution Policy Table). Also OpenVPN tries to keep local DNS resolution working when DNS is redirected into the tunnel. To prevent this from happening we have --block-outside-dns, in case you wonder. Basically we collect domains and name server addresses from network adapters and add so called exclude NRPT rules in addition to the catch all rule that is pushed by the server.
All is done via the interactive service, since modifying all this requires the elevated privileges that the openvpn process hopefully doesn't have.
---
M include/openvpn-msg.h
M src/openvpn/dns.c
M src/openvpn/dns.h
M src/openvpn/init.c
M src/openvpnserv/interactive.c
5 files changed, 1,098 insertions(+), 7 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/37/837/2
include/openvpn-msg.h +19 -0
@@ -35,6 +35,8 @@ msg_del_route, msg_add_dns_cfg, msg_del_dns_cfg, + msg_add_nrpt_cfg, + msg_del_nrpt_cfg, msg_add_nbt_cfg, msg_del_nbt_cfg, msg_flush_neighbors,
@@ -96,6 +98,23 @@inet_address_t addr[4 ];/* support up to 4 dns addresses */ } dns_cfg_message_t; + +typedef enum { + nrpt_dnssec +}nrpt_flags_t ; + +#define NRPT_ADDR_NUM 8/* Max. number of addresses */ +#define NRPT_ADDR_SIZE 48/* Max. address strlen + some */ +typedef char nrpt_address_t [NRPT_ADDR_SIZE ]; +typedef struct { +message_header_t header; +interface_t iface; +nrpt_address_t addresses[NRPT_ADDR_NUM ]; +char resolve_domains[512 ];/* double \0 terminated */ +char search_domains[512 ]; +nrpt_flags_t flags; +}nrpt_dns_cfg_message_t ; + typedef struct { message_header_t header; interface_t iface;
src/openvpn/dns.c +133 -0
148 lines not on this page · raw message
src/openvpn/dns.h +9 -0
@@ -26,6 +26,7 @@#include "buffer.h" #include "env_set.h" +#include "tun.h" enum dns_security {DNS_SECURITY_UNSET ,
@@ -147,6 +148,14 @@void dns_options_postprocess_pull (struct dns_options *o);/** +* Invokes the action associated with bringing DNS up or down +* @param up Boolean to set this call to "up" when true +* @param o Pointer to the program options +* @param tt Pointer to the connection's tuntap struct +*/ +void run_dns_up_down (bool up,struct options *o,const struct tuntap *tt); + +/** * Puts the DNS options into an environment set. * * @param o Pointer to the DNS options to set
src/openvpn/init.c +6 -0
@@ -2008,6 +2008,8 @@ c->c2.frame.tun_mtu, c->c2.es, &c->net_ctx); } +run_dns_up_down (true, &c->options, c->c1.tuntap); +/* run the up script */ run_up_down(c->options.up_script, c->plugins,
@@ -2046,6 +2048,8 @@/* explicitly set the ifconfig_* env vars */ do_ifconfig_setenv (c->c1.tuntap, c->c2.es); +run_dns_up_down (true, &c->options, c->c1.tuntap); +/* run the up script if user specified --up-restart */ if (c->options.up_restart) {
@@ -2134,6 +2138,8 @@ adapter_index = c->c1.tuntap->adapter_index;#endif +run_dns_up_down (false, &c->options, c->c1.tuntap); +if (force || !(c->sig->signal_received ==SIGUSR1 && c->options.persist_tun)) { static_context =NULL ;
src/openvpnserv/interactive.c +931 -7
1,018 lines not on this page · raw message
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I576e74f3276362606e9cbd50bb5adbebaaf209cc
Gerrit-Change-Number: 837
Gerrit-PatchSet: 2
Gerrit-Owner: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: d12fk, plaisthos.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/837?usp=email )
Change subject: win: implement --dns option support
......................................................................
Patch Set 5: Code-Review-1
(1 comment)
File src/openvpnserv/interactive.c:
http://gerrit.openvpn.net/c/openvpn/+/837/comment/74358983_c1d55f71 :
PS5, Line 2265: MsgToEventLog(M_SYSERR, TEXT("IsInterfaceConnected: "
This actually does not work correctly. You can't use multiple string literals as argument to TEXT()
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I576e74f3276362606e9cbd50bb5adbebaaf209cc
Gerrit-Change-Number: 837
Gerrit-PatchSet: 5
Gerrit-Owner: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: d12fk <[email protected]...>
Gerrit-Comment-Date: Sat, 28 Dec 2024 23:06:58 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, plaisthos.
d12fk has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/837?usp=email )
Change subject: win: implement --dns option support
......................................................................
Patch Set 5:
(1 comment)
File src/openvpnserv/interactive.c:
http://gerrit.openvpn.net/c/openvpn/+/837/comment/2035b4d7_a8134d49 :
PS5, Line 2265: MsgToEventLog(M_SYSERR, TEXT("IsInterfaceConnected: "
Quoted 1 line
This actually does not work correctly. […]
How did you get to this conclusion? Works for me, and Compiler Explorer also shows that the string is stored of wide characters: https://godbolt.org/z/Md6cPGsEb
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I576e74f3276362606e9cbd50bb5adbebaaf209cc
Gerrit-Change-Number: 837
Gerrit-PatchSet: 5
Gerrit-Owner: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Tue, 31 Dec 2024 00:02:02 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: flichtenheld <[email protected]...>
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
to look at the new patch set (#6).
The following approvals got outdated and were removed:
Code-Review-1 by flichtenheld
Change subject: win: implement --dns option support
......................................................................
win: implement --dns option support
Implement support for setting options from --dns. This is hugely different than what we had so far with DNS related --dhcp-option.
The main difference it that we support split DNS and DNSSEC by making use of NRPT (Name Resolution Policy Table). Also OpenVPN tries to keep local DNS resolution working when DNS is redirected into the tunnel. To prevent this from happening we have --block-outside-dns, in case you wonder. Basically we collect domains and name server addresses from network adapters and add so called exclude NRPT rules in addition to the catch all rule that is pushed by the server.
All is done via the interactive service, since modifying all this requires the elevated privileges that the openvpn process hopefully doesn't have.
---
M include/openvpn-msg.h
M src/openvpn/dns.c
M src/openvpn/dns.h
M src/openvpn/init.c
M src/openvpnserv/interactive.c
5 files changed, 1,097 insertions(+), 7 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/37/837/6
include/openvpn-msg.h +19 -0
@@ -35,6 +35,8 @@ msg_del_route, msg_add_dns_cfg, msg_del_dns_cfg, + msg_add_nrpt_cfg, + msg_del_nrpt_cfg, msg_add_nbt_cfg, msg_del_nbt_cfg, msg_flush_neighbors,
@@ -96,6 +98,23 @@inet_address_t addr[4 ];/* support up to 4 dns addresses */ } dns_cfg_message_t; + +typedef enum { + nrpt_dnssec +}nrpt_flags_t ; + +#define NRPT_ADDR_NUM 8/* Max. number of addresses */ +#define NRPT_ADDR_SIZE 48/* Max. address strlen + some */ +typedef char nrpt_address_t [NRPT_ADDR_SIZE ]; +typedef struct { +message_header_t header; +interface_t iface; +nrpt_address_t addresses[NRPT_ADDR_NUM ]; +char resolve_domains[512 ];/* double \0 terminated */ +char search_domains[512 ]; +nrpt_flags_t flags; +}nrpt_dns_cfg_message_t ; + typedef struct { message_header_t header; interface_t iface;
src/openvpn/dns.c +133 -0
148 lines not on this page · raw message
src/openvpn/dns.h +9 -0
@@ -26,6 +26,7 @@#include "buffer.h" #include "env_set.h" +#include "tun.h" enum dns_security {DNS_SECURITY_UNSET ,
@@ -147,6 +148,14 @@void dns_options_postprocess_pull (struct dns_options *o);/** +* Invokes the action associated with bringing DNS up or down +* @param up Boolean to set this call to "up" when true +* @param o Pointer to the program options +* @param tt Pointer to the connection's tuntap struct +*/ +void run_dns_up_down (bool up,struct options *o,const struct tuntap *tt); + +/** * Puts the DNS options into an environment set. * * @param o Pointer to the DNS options to set
src/openvpn/init.c +6 -0
@@ -2008,6 +2008,8 @@ c->c2.frame.tun_mtu, c->c2.es, &c->net_ctx); } +run_dns_up_down (true, &c->options, c->c1.tuntap); +/* run the up script */ run_up_down(c->options.up_script, c->plugins,
@@ -2046,6 +2048,8 @@/* explicitly set the ifconfig_* env vars */ do_ifconfig_setenv (c->c1.tuntap, c->c2.es); +run_dns_up_down (true, &c->options, c->c1.tuntap); +/* run the up script if user specified --up-restart */ if (c->options.up_restart) {
@@ -2134,6 +2138,8 @@ adapter_index = c->c1.tuntap->adapter_index;#endif +run_dns_up_down (false, &c->options, c->c1.tuntap); +if (force || !(c->sig->signal_received ==SIGUSR1 && c->options.persist_tun)) { static_context =NULL ;
src/openvpnserv/interactive.c +930 -7
1,011 lines not on this page · raw message
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I576e74f3276362606e9cbd50bb5adbebaaf209cc
Gerrit-Change-Number: 837
Gerrit-PatchSet: 6
Gerrit-Owner: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: d12fk, plaisthos.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/837?usp=email )
Change subject: win: implement --dns option support
......................................................................
Patch Set 6:
(1 comment)
File src/openvpnserv/interactive.c:
http://gerrit.openvpn.net/c/openvpn/+/837/comment/29071d80_c92d5c0a :
PS5, Line 2265: MsgToEventLog(M_SYSERR, TEXT("IsInterfaceConnected: "
Quoted 1 line
How did you get to this conclusion? Works for me, and Compiler Explorer also shows that the string i […]
Yeah, it seems to work even though I'm not exactly sure what the logic is that makes it work. Maybe when you have multiple string literals the L just gets applied from left to right? Either way I decided to instead get TEXT() removed completely from our code base, see my separate patch series. I will leave it to you whether you want to use it here and have it converted in my series or use L"" here directly.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I576e74f3276362606e9cbd50bb5adbebaaf209cc
Gerrit-Change-Number: 837
Gerrit-PatchSet: 6
Gerrit-Owner: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: d12fk <[email protected]...>
Gerrit-Comment-Date: Fri, 10 Jan 2025 13:11:20 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: flichtenheld <[email protected]...>
Comment-In-Reply-To: d12fk <[email protected]...>
Gerrit-MessageType: comment
Attention is currently required from: d12fk, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
to look at the new patch set (#10).
Change subject: win: implement --dns option support
......................................................................
win: implement --dns option support
Implement support for setting options from --dns. This is hugely different than what we had so far with DNS related --dhcp-option.
The main difference it that we support split DNS and DNSSEC by making use of NRPT (Name Resolution Policy Table). Also OpenVPN tries to keep local DNS resolution working when DNS is redirected into the tunnel. To prevent this from happening we have --block-outside-dns, in case you wonder. Basically we collect domains and name server addresses from network adapters and add so called exclude NRPT rules in addition to the catch all rule that is pushed by the server.
All is done via the interactive service, since modifying all this requires the elevated privileges that the openvpn process hopefully doesn't have.
---
M include/openvpn-msg.h
M src/openvpn/dns.c
M src/openvpn/dns.h
M src/openvpn/init.c
M src/openvpnserv/interactive.c
5 files changed, 1,126 insertions(+), 7 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/37/837/10
include/openvpn-msg.h +19 -0
@@ -35,6 +35,8 @@ msg_del_route, msg_add_dns_cfg, msg_del_dns_cfg, + msg_add_nrpt_cfg, + msg_del_nrpt_cfg, msg_add_nbt_cfg, msg_del_nbt_cfg, msg_flush_neighbors,
@@ -96,6 +98,23 @@inet_address_t addr[4 ];/* support up to 4 dns addresses */ } dns_cfg_message_t; + +typedef enum { + nrpt_dnssec +}nrpt_flags_t ; + +#define NRPT_ADDR_NUM 8/* Max. number of addresses */ +#define NRPT_ADDR_SIZE 48/* Max. address strlen + some */ +typedef char nrpt_address_t [NRPT_ADDR_SIZE ]; +typedef struct { +message_header_t header; +interface_t iface; +nrpt_address_t addresses[NRPT_ADDR_NUM ]; +char resolve_domains[512 ];/* double \0 terminated */ +char search_domains[512 ]; +nrpt_flags_t flags; +}nrpt_dns_cfg_message_t ; + typedef struct { message_header_t header; interface_t iface;
src/openvpn/dns.c +162 -0
177 lines not on this page · raw message
src/openvpn/dns.h +9 -0
@@ -26,6 +26,7 @@#include "buffer.h" #include "env_set.h" +#include "tun.h" enum dns_security {DNS_SECURITY_UNSET ,
@@ -147,6 +148,14 @@void dns_options_postprocess_pull (struct dns_options *o);/** +* Invokes the action associated with bringing DNS up or down +* @param up Boolean to set this call to "up" when true +* @param o Pointer to the program options +* @param tt Pointer to the connection's tuntap struct +*/ +void run_dns_up_down (bool up,struct options *o,const struct tuntap *tt); + +/** * Puts the DNS options into an environment set. * * @param o Pointer to the DNS options to set
src/openvpn/init.c +6 -0
@@ -2025,6 +2025,8 @@ c->c2.frame.tun_mtu, c->c2.es, &c->net_ctx); } +run_dns_up_down (true, &c->options, c->c1.tuntap); +/* run the up script */ run_up_down(c->options.up_script, c->plugins,
@@ -2063,6 +2065,8 @@/* explicitly set the ifconfig_* env vars */ do_ifconfig_setenv (c->c1.tuntap, c->c2.es); +run_dns_up_down (true, &c->options, c->c1.tuntap); +/* run the up script if user specified --up-restart */ if (c->options.up_restart) {
@@ -2151,6 +2155,8 @@ adapter_index = c->c1.tuntap->adapter_index;#endif +run_dns_up_down (false, &c->options, c->c1.tuntap); +if (force || !(c->sig->signal_received ==SIGUSR1 && c->options.persist_tun)) { static_context =NULL ;
src/openvpnserv/interactive.c +930 -7
1,011 lines not on this page · raw message
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I576e74f3276362606e9cbd50bb5adbebaaf209cc
Gerrit-Change-Number: 837
Gerrit-PatchSet: 10
Gerrit-Owner: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: d12fk <[email protected]...>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [XL] Change in openvpn[master]: win: implement --dns option support with NRPT
In reply to a message not in the archiveAttention is currently required from: d12fk, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
to look at the new patch set (#13).
Change subject: win: implement --dns option support with NRPT
......................................................................
win: implement --dns option support with NRPT
Implement support for setting options from --dns. This is hugely different than what we had so far with DNS related --dhcp-option.
The main difference it that we support split DNS and DNSSEC by making use of NRPT (Name Resolution Policy Table). Also OpenVPN tries to keep local DNS resolution working when DNS is redirected into the tunnel. To prevent this from happening we have --block-outside-dns, in case you wonder. Basically we collect domains and name server addresses from network adapters and add so called exclude NRPT rules in addition to the catch all rule that is pushed by the server.
All is done via the interactive service, since modifying all this requires the elevated privileges that the openvpn process hopefully doesn't have.
---
M include/openvpn-msg.h
M src/openvpn/dns.c
M src/openvpn/dns.h
M src/openvpn/init.c
M src/openvpnserv/interactive.c
5 files changed, 1,126 insertions(+), 7 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/37/837/13
include/openvpn-msg.h +19 -0
@@ -35,6 +35,8 @@ msg_del_route, msg_add_dns_cfg, msg_del_dns_cfg, + msg_add_nrpt_cfg, + msg_del_nrpt_cfg, msg_add_nbt_cfg, msg_del_nbt_cfg, msg_flush_neighbors,
@@ -96,6 +98,23 @@inet_address_t addr[4 ];/* support up to 4 dns addresses */ } dns_cfg_message_t; + +typedef enum { + nrpt_dnssec +}nrpt_flags_t ; + +#define NRPT_ADDR_NUM 8/* Max. number of addresses */ +#define NRPT_ADDR_SIZE 48/* Max. address strlen + some */ +typedef char nrpt_address_t [NRPT_ADDR_SIZE ]; +typedef struct { +message_header_t header; +interface_t iface; +nrpt_address_t addresses[NRPT_ADDR_NUM ]; +char resolve_domains[512 ];/* double \0 terminated */ +char search_domains[512 ]; +nrpt_flags_t flags; +}nrpt_dns_cfg_message_t ; + typedef struct { message_header_t header; interface_t iface;
src/openvpn/dns.c +162 -0
177 lines not on this page · raw message
src/openvpn/dns.h +9 -0
@@ -26,6 +26,7 @@#include "buffer.h" #include "env_set.h" +#include "tun.h" enum dns_security {DNS_SECURITY_UNSET ,
@@ -147,6 +148,14 @@void dns_options_postprocess_pull (struct dns_options *o);/** +* Invokes the action associated with bringing DNS up or down +* @param up Boolean to set this call to "up" when true +* @param o Pointer to the program options +* @param tt Pointer to the connection's tuntap struct +*/ +void run_dns_up_down (bool up,struct options *o,const struct tuntap *tt); + +/** * Puts the DNS options into an environment set. * * @param o Pointer to the DNS options to set
src/openvpn/init.c +6 -0
@@ -2026,6 +2026,8 @@ c->c2.frame.tun_mtu, c->c2.es, &c->net_ctx); } +run_dns_up_down (true, &c->options, c->c1.tuntap); +/* run the up script */ run_up_down(c->options.up_script, c->plugins,
@@ -2064,6 +2066,8 @@/* explicitly set the ifconfig_* env vars */ do_ifconfig_setenv (c->c1.tuntap, c->c2.es); +run_dns_up_down (true, &c->options, c->c1.tuntap); +/* run the up script if user specified --up-restart */ if (c->options.up_restart) {
@@ -2152,6 +2156,8 @@ adapter_index = c->c1.tuntap->adapter_index;#endif +run_dns_up_down (false, &c->options, c->c1.tuntap); +if (force || !(c->sig->signal_received ==SIGUSR1 && c->options.persist_tun)) { static_context =NULL ;
src/openvpnserv/interactive.c +930 -7
1,011 lines not on this page · raw message
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I576e74f3276362606e9cbd50bb5adbebaaf209cc
Gerrit-Change-Number: 837
Gerrit-PatchSet: 13
Gerrit-Owner: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: d12fk <[email protected]...>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [XL] Change in openvpn[master]: win: implement --dns option support with NRPT
In reply to a message not in the archiveAttention is currently required from: d12fk, plaisthos.
stipa has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/837?usp=email )
Change subject: win: implement --dns option support with NRPT
......................................................................
Patch Set 13: Code-Review-2
(2 comments)
File src/openvpnserv/interactive.c:
http://gerrit.openvpn.net/c/openvpn/+/837/comment/527430f0_4471f7d6 :
PS13, Line 2602: free(wide_domains);
If domains is not set, we're freeing stack-allocated wide_domains (PWSTR wide_domains = L".\0";).
http://gerrit.openvpn.net/c/openvpn/+/837/comment/828a5a05_4a81dca3 :
PS13, Line 2782: DWORD iid_err = InterfaceIdString(msg->iface.name, iid, sizeof(iid));
We pass sizeof(iid) as count to wcsncpy and it should be count of wide chars, not the buffer size. This causes crash.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I576e74f3276362606e9cbd50bb5adbebaaf209cc
Gerrit-Change-Number: 837
Gerrit-PatchSet: 13
Gerrit-Owner: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: d12fk <[email protected]...>
Gerrit-Comment-Date: Wed, 19 Mar 2025 13:58:01 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[Openvpn-devel] [XL] Change in openvpn[master]: win: implement --dns option support with NRPT
In reply to a message not in the archiveAttention is currently required from: plaisthos, stipa.
d12fk has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/837?usp=email )
Change subject: win: implement --dns option support with NRPT
......................................................................
Patch Set 13:
(2 comments)
File src/openvpnserv/interactive.c:
http://gerrit.openvpn.net/c/openvpn/+/837/comment/b96c8df4_7beb686c :
PS13, Line 2602: free(wide_domains);
Quoted 1 line
If domains is not set, we're freeing stack-allocated
wide_domains(PWSTRwide_domains= L".\0";).
Done
http://gerrit.openvpn.net/c/openvpn/+/837/comment/8eed4464_e3ea759f :
PS13, Line 2782: DWORD iid_err = InterfaceIdString(msg->iface.name, iid, sizeof(iid));
Quoted 1 line
We pass sizeof(iid) as count to wcsncpy and it should be count of wide chars, not the buffer size. […]
Done
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I576e74f3276362606e9cbd50bb5adbebaaf209cc
Gerrit-Change-Number: 837
Gerrit-PatchSet: 13
Gerrit-Owner: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: stipa <[email protected]...>
Gerrit-Comment-Date: Wed, 19 Mar 2025 22:45:41 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: stipa <[email protected]...>
Gerrit-MessageType: comment
[Openvpn-devel] [XL] Change in openvpn[master]: win: implement --dns option support with NRPT
In reply to a message not in the archiveAttention is currently required from: plaisthos, stipa.
Hello flichtenheld, plaisthos, stipa,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
to look at the new patch set (#14).
Change subject: win: implement --dns option support with NRPT
......................................................................
win: implement --dns option support with NRPT
Implement support for setting options from --dns. This is hugely different than what we had so far with DNS related --dhcp-option.
The main difference it that we support split DNS and DNSSEC by making use of NRPT (Name Resolution Policy Table). Also OpenVPN tries to keep local DNS resolution working when DNS is redirected into the tunnel. To prevent this from happening we have --block-outside-dns, in case you wonder. Basically we collect domains and name server addresses from network adapters and add so called exclude NRPT rules in addition to the catch all rule that is pushed by the server.
All is done via the interactive service, since modifying all this requires the elevated privileges that the openvpn process hopefully doesn't have.
---
M include/openvpn-msg.h
M src/openvpn/dns.c
M src/openvpn/dns.h
M src/openvpn/init.c
M src/openvpnserv/interactive.c
5 files changed, 1,129 insertions(+), 7 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/37/837/14
include/openvpn-msg.h +19 -0
@@ -35,6 +35,8 @@ msg_del_route, msg_add_dns_cfg, msg_del_dns_cfg, + msg_add_nrpt_cfg, + msg_del_nrpt_cfg, msg_add_nbt_cfg, msg_del_nbt_cfg, msg_flush_neighbors,
@@ -96,6 +98,23 @@inet_address_t addr[4 ];/* support up to 4 dns addresses */ } dns_cfg_message_t; + +typedef enum { + nrpt_dnssec +}nrpt_flags_t ; + +#define NRPT_ADDR_NUM 8/* Max. number of addresses */ +#define NRPT_ADDR_SIZE 48/* Max. address strlen + some */ +typedef char nrpt_address_t [NRPT_ADDR_SIZE ]; +typedef struct { +message_header_t header; +interface_t iface; +nrpt_address_t addresses[NRPT_ADDR_NUM ]; +char resolve_domains[512 ];/* double \0 terminated */ +char search_domains[512 ]; +nrpt_flags_t flags; +}nrpt_dns_cfg_message_t ; + typedef struct { message_header_t header; interface_t iface;
src/openvpn/dns.c +162 -0
177 lines not on this page · raw message
src/openvpn/dns.h +9 -0
@@ -26,6 +26,7 @@#include "buffer.h" #include "env_set.h" +#include "tun.h" enum dns_security {DNS_SECURITY_UNSET ,
@@ -147,6 +148,14 @@void dns_options_postprocess_pull (struct dns_options *o);/** +* Invokes the action associated with bringing DNS up or down +* @param up Boolean to set this call to "up" when true +* @param o Pointer to the program options +* @param tt Pointer to the connection's tuntap struct +*/ +void run_dns_up_down (bool up,struct options *o,const struct tuntap *tt); + +/** * Puts the DNS options into an environment set. * * @param o Pointer to the DNS options to set
src/openvpn/init.c +6 -0
@@ -2026,6 +2026,8 @@ c->c2.frame.tun_mtu, c->c2.es, &c->net_ctx); } +run_dns_up_down (true, &c->options, c->c1.tuntap); +/* run the up script */ run_up_down(c->options.up_script, c->plugins,
@@ -2064,6 +2066,8 @@/* explicitly set the ifconfig_* env vars */ do_ifconfig_setenv (c->c1.tuntap, c->c2.es); +run_dns_up_down (true, &c->options, c->c1.tuntap); +/* run the up script if user specified --up-restart */ if (c->options.up_restart) {
@@ -2152,6 +2156,8 @@ adapter_index = c->c1.tuntap->adapter_index;#endif +run_dns_up_down (false, &c->options, c->c1.tuntap); +if (force || !(c->sig->signal_received ==SIGUSR1 && c->options.persist_tun)) { static_context =NULL ;
src/openvpnserv/interactive.c +933 -7
1,014 lines not on this page · raw message
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I576e74f3276362606e9cbd50bb5adbebaaf209cc
Gerrit-Change-Number: 837
Gerrit-PatchSet: 14
Gerrit-Owner: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: stipa <[email protected]...>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [XL] Change in openvpn[master]: win: implement --dns option support with NRPT
In reply to a message not in the archiveAttention is currently required from: d12fk, plaisthos.
stipa has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/837?usp=email )
Change subject: win: implement --dns option support with NRPT
......................................................................
Patch Set 14: -Code-Review
(3 comments)
Patchset:
PS14:
Is split-dns already supposed to work? In my server config I have
push "dns server 1 resolve-domains fi"
push "dns server 1 address 1.1.1.1"
push "dns server 2 resolve-domains io"
push "dns server 2 address 8.8.8.8"
so I would expect .fi go to 1.1.1.1 and .io to 8.8.8.8, but instead only one registry entry .fi is created with 1.1.1.1.
Also, with that
push "dns server 1 resolve-domains fi"
push "dns server 1 address 1.1.1.1"
in addition to NRPT we set 1.1.1.1 on VPN adapter and many DNS requests not directed to .fi domains also resolved via 1.1.1.1. This contradicts to what documentation says: "where only the given domains are resolved by the server".
File src/openvpnserv/interactive.c:
http://gerrit.openvpn.net/c/openvpn/+/837/comment/8e6ebec0_a562e6ce :
PS14, Line 2259: MsgToEventLog(M_SYSERR, TEXT("IsInterfaceConnected: "
At least on my machine I have 6 "real" network adapters (according to Get-NetAdapter | Format-List Name, InterfaceGuid) and 12 registry keys, apparently those are disabled/hidden etc. Because of that I got lots of scary "IsInterfaceConnected: could not convert interface {F2D72071-CB76-4D6F-9DC8-EDAA3AC6B387} GUID to LUID" messages. Let's don't display this error message - at least if ConvertInterfaceGuidToLuid returns ERROR_INVALID_PARAMETER.
http://gerrit.openvpn.net/c/openvpn/+/837/comment/427ad111_8562738a :
PS14, Line 2510: for (int i = 0; i < _countof(data); ++i)
Does it really make sense to create keys for all adapters, even if there are no domains/servers defined?
Could we do it only if there are adapter-specific domains defined?
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I576e74f3276362606e9cbd50bb5adbebaaf209cc
Gerrit-Change-Number: 837
Gerrit-PatchSet: 14
Gerrit-Owner: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: d12fk <[email protected]...>
Gerrit-Comment-Date: Fri, 21 Mar 2025 14:09:47 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[Openvpn-devel] [XL] Change in openvpn[master]: win: implement --dns option support with NRPT
In reply to a message not in the archiveAttention is currently required from: plaisthos, stipa.
d12fk has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/837?usp=email )
Change subject: win: implement --dns option support with NRPT
......................................................................
Patch Set 14:
(2 comments)
File src/openvpnserv/interactive.c:
http://gerrit.openvpn.net/c/openvpn/+/837/comment/b99905f4_e88c89db :
PS14, Line 2259: MsgToEventLog(M_SYSERR, TEXT("IsInterfaceConnected: "
Quoted 1 line
At least on my machine I have 6 "real" network adapters (according to Get-NetAdapter | Format-List N […]
Hm, I do not have adapters I can reproduce this on my system. Shall we do a joined session figuring this out, or do you have an idea already, why these adapters are listed in the interfaces registry hive, but fail to produce a LUID?
http://gerrit.openvpn.net/c/openvpn/+/837/comment/44df0b7c_cc86afff :
PS14, Line 2510: for (int i = 0; i < _countof(data); ++i)
Quoted 1 line
Does it really make sense to create keys for all adapters, even if there are no domains/servers defi […]
Yeah, if no domains or nameservers are defined the adapters are not added as exclude data, so there will be no RoutingX NRPT rules for those. I think that was what you were asking, right?
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I576e74f3276362606e9cbd50bb5adbebaaf209cc
Gerrit-Change-Number: 837
Gerrit-PatchSet: 14
Gerrit-Owner: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: stipa <[email protected]...>
Gerrit-Comment-Date: Wed, 26 Mar 2025 03:54:10 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: stipa <[email protected]...>
Gerrit-MessageType: comment
[Openvpn-devel] [XL] Change in openvpn[master]: win: implement --dns option support with NRPT
In reply to a message not in the archiveAttention is currently required from: d12fk, plaisthos.
stipa has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/837?usp=email )
Change subject: win: implement --dns option support with NRPT
......................................................................
Patch Set 14:
(2 comments)
File src/openvpnserv/interactive.c:
http://gerrit.openvpn.net/c/openvpn/+/837/comment/b879805b_55fa9a7f :
PS14, Line 2259: MsgToEventLog(M_SYSERR, TEXT("IsInterfaceConnected: "
Quoted 1 line
Hm, I do not have adapters I can reproduce this on my system. […]
Sure. In my case it is probably Hyper-V virtual adapters.
https://gist.github.com/lstipakov/b30a662ab8001d4a07ddda7406808eb5
Again, I think it is fine just to omit error message in this error case.
http://gerrit.openvpn.net/c/openvpn/+/837/comment/a11626e1_0dcbd6ed :
PS14, Line 2510: for (int i = 0; i < _countof(data); ++i)
Quoted 1 line
Yeah, if no domains or nameservers are defined the adapters are not added as exclude data, so there […]
But there are: https://usercontent.irccloud-cdn.com/file/eJy2zlR6/image.png
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I576e74f3276362606e9cbd50bb5adbebaaf209cc
Gerrit-Change-Number: 837
Gerrit-PatchSet: 14
Gerrit-Owner: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: d12fk <[email protected]...>
Gerrit-Comment-Date: Wed, 26 Mar 2025 08:55:03 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: d12fk <[email protected]...>
Comment-In-Reply-To: stipa <[email protected]...>
Gerrit-MessageType: comment
[Openvpn-devel] [XL] Change in openvpn[master]: win: implement --dns option support with NRPT
In reply to a message not in the archiveAttention is currently required from: plaisthos, stipa.
d12fk has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/837?usp=email )
Change subject: win: implement --dns option support with NRPT
......................................................................
Patch Set 14:
(2 comments)
File src/openvpnserv/interactive.c:
http://gerrit.openvpn.net/c/openvpn/+/837/comment/d4afefe5_56002315 :
PS14, Line 2259: MsgToEventLog(M_SYSERR, TEXT("IsInterfaceConnected: "
Quoted 1 line
Sure. In my case it is probably Hyper-V virtual adapters. […]
The code fails now without error message if ConvertInterfaceGuidToLuid() fails. However, I wonder why it fails in the first place with those interfaces. Basically that means that for any interface, where this conversion fails, there will be no exclude rules ever, and not even a diagnostic message to explain this. Leaves an uneasy feeling behind for me.
http://gerrit.openvpn.net/c/openvpn/+/837/comment/085ad92a_b096baa2 :
PS14, Line 2510: for (int i = 0; i < _countof(data); ++i)
Quoted 1 line
But there are: https://usercontent.irccloud-cdn.com/file/eJy2zlR6/image. […]
Done
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I576e74f3276362606e9cbd50bb5adbebaaf209cc
Gerrit-Change-Number: 837
Gerrit-PatchSet: 14
Gerrit-Owner: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: stipa <[email protected]...>
Gerrit-Comment-Date: Thu, 27 Mar 2025 01:28:37 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: d12fk <[email protected]...>
Comment-In-Reply-To: stipa <[email protected]...>
Gerrit-MessageType: comment
[Openvpn-devel] [XL] Change in openvpn[master]: win: implement --dns option support with NRPT
In reply to a message not in the archiveAttention is currently required from: plaisthos, stipa.
Hello flichtenheld, plaisthos, stipa,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
to look at the new patch set (#15).
Change subject: win: implement --dns option support with NRPT
......................................................................
win: implement --dns option support with NRPT
Implement support for setting options from --dns. This is hugely different than what we had so far with DNS related --dhcp-option.
The main difference it that we support split DNS and DNSSEC by making use of NRPT (Name Resolution Policy Table). Also OpenVPN tries to keep local DNS resolution working when DNS is redirected into the tunnel. To prevent this from happening we have --block-outside-dns, in case you wonder. Basically we collect domains and name server addresses from network adapters and add so called exclude NRPT rules in addition to the catch all rule that is pushed by the server.
All is done via the interactive service, since modifying all this requires the elevated privileges that the openvpn process hopefully doesn't have.
---
M include/openvpn-msg.h
M src/openvpn/dns.c
M src/openvpn/dns.h
M src/openvpn/init.c
M src/openvpnserv/interactive.c
5 files changed, 1,125 insertions(+), 7 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/37/837/15
include/openvpn-msg.h +19 -0
@@ -35,6 +35,8 @@ msg_del_route, msg_add_dns_cfg, msg_del_dns_cfg, + msg_add_nrpt_cfg, + msg_del_nrpt_cfg, msg_add_nbt_cfg, msg_del_nbt_cfg, msg_flush_neighbors,
@@ -96,6 +98,23 @@inet_address_t addr[4 ];/* support up to 4 dns addresses */ } dns_cfg_message_t; + +typedef enum { + nrpt_dnssec +}nrpt_flags_t ; + +#define NRPT_ADDR_NUM 8/* Max. number of addresses */ +#define NRPT_ADDR_SIZE 48/* Max. address strlen + some */ +typedef char nrpt_address_t [NRPT_ADDR_SIZE ]; +typedef struct { +message_header_t header; +interface_t iface; +nrpt_address_t addresses[NRPT_ADDR_NUM ]; +char resolve_domains[512 ];/* double \0 terminated */ +char search_domains[512 ]; +nrpt_flags_t flags; +}nrpt_dns_cfg_message_t ; + typedef struct { message_header_t header; interface_t iface;
src/openvpn/dns.c +162 -0
177 lines not on this page · raw message
src/openvpn/dns.h +9 -0
@@ -26,6 +26,7 @@#include "buffer.h" #include "env_set.h" +#include "tun.h" enum dns_security {DNS_SECURITY_UNSET ,
@@ -147,6 +148,14 @@void dns_options_postprocess_pull (struct dns_options *o);/** +* Invokes the action associated with bringing DNS up or down +* @param up Boolean to set this call to "up" when true +* @param o Pointer to the program options +* @param tt Pointer to the connection's tuntap struct +*/ +void run_dns_up_down (bool up,struct options *o,const struct tuntap *tt); + +/** * Puts the DNS options into an environment set. * * @param o Pointer to the DNS options to set
src/openvpn/init.c +6 -0
@@ -2026,6 +2026,8 @@ c->c2.frame.tun_mtu, c->c2.es, &c->net_ctx); } +run_dns_up_down (true, &c->options, c->c1.tuntap); +/* run the up script */ run_up_down(c->options.up_script, c->plugins,
@@ -2064,6 +2066,8 @@/* explicitly set the ifconfig_* env vars */ do_ifconfig_setenv (c->c1.tuntap, c->c2.es); +run_dns_up_down (true, &c->options, c->c1.tuntap); +/* run the up script if user specified --up-restart */ if (c->options.up_restart) {
@@ -2152,6 +2156,8 @@ adapter_index = c->c1.tuntap->adapter_index;#endif +run_dns_up_down (false, &c->options, c->c1.tuntap); +if (force || !(c->sig->signal_received ==SIGUSR1 && c->options.persist_tun)) { static_context =NULL ;
src/openvpnserv/interactive.c +929 -7
1,010 lines not on this page · raw message
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I576e74f3276362606e9cbd50bb5adbebaaf209cc
Gerrit-Change-Number: 837
Gerrit-PatchSet: 15
Gerrit-Owner: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: stipa <[email protected]...>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [XL] Change in openvpn[master]: win: implement --dns option support with NRPT
In reply to a message not in the archiveAttention is currently required from: d12fk, plaisthos.
stipa has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/837?usp=email )
Change subject: win: implement --dns option support with NRPT
......................................................................
Patch Set 15: Code-Review-2
(1 comment)
File src/openvpnserv/interactive.c:
http://gerrit.openvpn.net/c/openvpn/+/837/comment/280dd3ed_8e292101 :
PS15, Line 2187: err = RegGetValueW(itf, NULL, values[i], RRF_RT_REG_SZ, NULL, (PBYTE)domains, size);
For existing but empty values, the size will be set to 2. As a result, on the next iteration we got ERROR_MORE_DATA if there is a non-empty value.
How about:
```
DWORD cbData = *size;
err = RegGetValueW(itf, NULL, values[i], RRF_RT_REG_SZ, NULL, (PBYTE)domains, &cbData);
if (!err && cbData > one_glyph && wcschr(domains, '.'))
{
*size = cbData;
```--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I576e74f3276362606e9cbd50bb5adbebaaf209cc
Gerrit-Change-Number: 837
Gerrit-PatchSet: 15
Gerrit-Owner: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: d12fk <[email protected]...>
Gerrit-Comment-Date: Thu, 27 Mar 2025 10:05:22 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[Openvpn-devel] [XL] Change in openvpn[master]: win: implement --dns option support with NRPT
In reply to a message not in the archiveAttention is currently required from: d12fk, plaisthos.
Hello flichtenheld, plaisthos, stipa,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
to look at the new patch set (#16).
Change subject: win: implement --dns option support with NRPT
......................................................................
win: implement --dns option support with NRPT
Implement support for setting options from --dns. This is hugely different than what we had so far with DNS related --dhcp-option.
The main difference it that we support split DNS and DNSSEC by making use of NRPT (Name Resolution Policy Table). Also OpenVPN tries to keep local DNS resolution working when DNS is redirected into the tunnel. To prevent this from happening we have --block-outside-dns, in case you wonder. Basically we collect domains and name server addresses from network adapters and add so called exclude NRPT rules in addition to the catch all rule that is pushed by the server.
All is done via the interactive service, since modifying all this requires the elevated privileges that the openvpn process hopefully doesn't have.
---
M include/openvpn-msg.h
M src/openvpn/dns.c
M src/openvpn/dns.h
M src/openvpn/init.c
M src/openvpnserv/interactive.c
5 files changed, 1,148 insertions(+), 30 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/37/837/16
include/openvpn-msg.h +19 -0
@@ -35,6 +35,8 @@ msg_del_route, msg_add_dns_cfg, msg_del_dns_cfg, + msg_add_nrpt_cfg, + msg_del_nrpt_cfg, msg_add_nbt_cfg, msg_del_nbt_cfg, msg_flush_neighbors,
@@ -96,6 +98,23 @@inet_address_t addr[4 ];/* support up to 4 dns addresses */ } dns_cfg_message_t; + +typedef enum { + nrpt_dnssec +}nrpt_flags_t ; + +#define NRPT_ADDR_NUM 8/* Max. number of addresses */ +#define NRPT_ADDR_SIZE 48/* Max. address strlen + some */ +typedef char nrpt_address_t [NRPT_ADDR_SIZE ]; +typedef struct { +message_header_t header; +interface_t iface; +nrpt_address_t addresses[NRPT_ADDR_NUM ]; +char resolve_domains[512 ];/* double \0 terminated */ +char search_domains[512 ]; +nrpt_flags_t flags; +}nrpt_dns_cfg_message_t ; + typedef struct { message_header_t header; interface_t iface;
src/openvpn/dns.c +162 -0
177 lines not on this page · raw message
src/openvpn/dns.h +9 -0
@@ -26,6 +26,7 @@#include "buffer.h" #include "env_set.h" +#include "tun.h" enum dns_security {DNS_SECURITY_UNSET ,
@@ -147,6 +148,14 @@void dns_options_postprocess_pull (struct dns_options *o);/** +* Invokes the action associated with bringing DNS up or down +* @param up Boolean to set this call to "up" when true +* @param o Pointer to the program options +* @param tt Pointer to the connection's tuntap struct +*/ +void run_dns_up_down (bool up,struct options *o,const struct tuntap *tt); + +/** * Puts the DNS options into an environment set. * * @param o Pointer to the DNS options to set
src/openvpn/init.c +6 -0
@@ -2026,6 +2026,8 @@ c->c2.frame.tun_mtu, c->c2.es, &c->net_ctx); } +run_dns_up_down (true, &c->options, c->c1.tuntap); +/* run the up script */ run_up_down(c->options.up_script, c->plugins,
@@ -2064,6 +2066,8 @@/* explicitly set the ifconfig_* env vars */ do_ifconfig_setenv (c->c1.tuntap, c->c2.es); +run_dns_up_down (true, &c->options, c->c1.tuntap); +/* run the up script if user specified --up-restart */ if (c->options.up_restart) {
@@ -2152,6 +2156,8 @@ adapter_index = c->c1.tuntap->adapter_index;#endif +run_dns_up_down (false, &c->options, c->c1.tuntap); +if (force || !(c->sig->signal_received ==SIGUSR1 && c->options.persist_tun)) { static_context =NULL ;
src/openvpnserv/interactive.c +952 -30
1,191 lines not on this page · raw message
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I576e74f3276362606e9cbd50bb5adbebaaf209cc
Gerrit-Change-Number: 837
Gerrit-PatchSet: 16
Gerrit-Owner: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: d12fk <[email protected]...>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [XL] Change in openvpn[master]: win: implement --dns option support with NRPT
In reply to a message not in the archiveAttention is currently required from: plaisthos, stipa.
d12fk has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/837?usp=email )
Change subject: win: implement --dns option support with NRPT
......................................................................
Patch Set 16:
(1 comment)
File src/openvpnserv/interactive.c:
http://gerrit.openvpn.net/c/openvpn/+/837/comment/a8476c39_19850a6f :
PS15, Line 2187: err = RegGetValueW(itf, NULL, values[i], RRF_RT_REG_SZ, NULL, (PBYTE)domains, size);
Quoted 1 line
For existing but empty values, the size will be set to 2. […]
Very nice find.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I576e74f3276362606e9cbd50bb5adbebaaf209cc
Gerrit-Change-Number: 837
Gerrit-PatchSet: 16
Gerrit-Owner: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: stipa <[email protected]...>
Gerrit-Comment-Date: Sat, 05 Apr 2025 04:11:35 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: stipa <[email protected]...>
Gerrit-MessageType: comment
[Openvpn-devel] [XL] Change in openvpn[master]: win: implement --dns option support with NRPT
In reply to a message not in the archiveAttention is currently required from: plaisthos, stipa.
Hello flichtenheld, plaisthos, stipa,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
to look at the new patch set (#17).
Change subject: win: implement --dns option support with NRPT
......................................................................
win: implement --dns option support with NRPT
Implement support for setting options from --dns. This is hugely different than what we had so far with DNS related --dhcp-option.
The main difference it that we support split DNS and DNSSEC by making use of NRPT (Name Resolution Policy Table). Also OpenVPN tries to keep local DNS resolution working when DNS is redirected into the tunnel. To prevent this from happening we have --block-outside-dns, in case you wonder. Basically we collect domains and name server addresses from network adapters and add so called exclude NRPT rules in addition to the catch all rule that is pushed by the server.
All is done via the interactive service, since modifying all this requires the elevated privileges that the openvpn process hopefully doesn't have.
---
M include/openvpn-msg.h
M src/openvpn/dns.c
M src/openvpn/dns.h
M src/openvpn/init.c
M src/openvpnserv/interactive.c
5 files changed, 1,149 insertions(+), 30 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/37/837/17
include/openvpn-msg.h +19 -0
@@ -35,6 +35,8 @@ msg_del_route, msg_add_dns_cfg, msg_del_dns_cfg, + msg_add_nrpt_cfg, + msg_del_nrpt_cfg, msg_add_nbt_cfg, msg_del_nbt_cfg, msg_flush_neighbors,
@@ -96,6 +98,23 @@inet_address_t addr[4 ];/* support up to 4 dns addresses */ } dns_cfg_message_t; + +typedef enum { + nrpt_dnssec +}nrpt_flags_t ; + +#define NRPT_ADDR_NUM 8/* Max. number of addresses */ +#define NRPT_ADDR_SIZE 48/* Max. address strlen + some */ +typedef char nrpt_address_t [NRPT_ADDR_SIZE ]; +typedef struct { +message_header_t header; +interface_t iface; +nrpt_address_t addresses[NRPT_ADDR_NUM ]; +char resolve_domains[512 ];/* double \0 terminated */ +char search_domains[512 ]; +nrpt_flags_t flags; +}nrpt_dns_cfg_message_t ; + typedef struct { message_header_t header; interface_t iface;
src/openvpn/dns.c +162 -0
177 lines not on this page · raw message
src/openvpn/dns.h +9 -0
@@ -26,6 +26,7 @@#include "buffer.h" #include "env_set.h" +#include "tun.h" enum dns_security {DNS_SECURITY_UNSET ,
@@ -147,6 +148,14 @@void dns_options_postprocess_pull (struct dns_options *o);/** +* Invokes the action associated with bringing DNS up or down +* @param up Boolean to set this call to "up" when true +* @param o Pointer to the program options +* @param tt Pointer to the connection's tuntap struct +*/ +void run_dns_up_down (bool up,struct options *o,const struct tuntap *tt); + +/** * Puts the DNS options into an environment set. * * @param o Pointer to the DNS options to set
src/openvpn/init.c +6 -0
@@ -2026,6 +2026,8 @@ c->c2.frame.tun_mtu, c->c2.es, &c->net_ctx); } +run_dns_up_down (true, &c->options, c->c1.tuntap); +/* run the up script */ run_up_down(c->options.up_script, c->plugins,
@@ -2064,6 +2066,8 @@/* explicitly set the ifconfig_* env vars */ do_ifconfig_setenv (c->c1.tuntap, c->c2.es); +run_dns_up_down (true, &c->options, c->c1.tuntap); +/* run the up script if user specified --up-restart */ if (c->options.up_restart) {
@@ -2152,6 +2156,8 @@ adapter_index = c->c1.tuntap->adapter_index;#endif +run_dns_up_down (false, &c->options, c->c1.tuntap); +if (force || !(c->sig->signal_received ==SIGUSR1 && c->options.persist_tun)) { static_context =NULL ;
src/openvpnserv/interactive.c +953 -30
1,192 lines not on this page · raw message
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I576e74f3276362606e9cbd50bb5adbebaaf209cc
Gerrit-Change-Number: 837
Gerrit-PatchSet: 17
Gerrit-Owner: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: stipa <[email protected]...>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [XL] Change in openvpn[master]: win: implement --dns option support with NRPT
In reply to a message not in the archiveAttention is currently required from: d12fk, plaisthos.
stipa has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/837?usp=email )
Change subject: win: implement --dns option support with NRPT
......................................................................
Patch Set 18: Code-Review+2
(1 comment)
Patchset:
PS18:
I couldn't find any more issues in the code, I tested it and it works like expected - I checked that the NRPT rules are created/removed and adapter-specific DNS suffixes are also respected in NRPT.
Probably not directly related to this patch, but the behavior is now not according to man page. For example if server pushes
push "dns server 1 resolve-domains fi"
push "dns server 1 address 1.1.1.1"
I would expect only .fi domains being resolved via 1.1.1.1, however ALL domains are resolved via 1.1.1.1 - this is likely because we set 1.1.1.1 DNS on VPN adapter. why we do it in addition to NRPT? We should either change the man page or fix the behavior.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I576e74f3276362606e9cbd50bb5adbebaaf209cc
Gerrit-Change-Number: 837
Gerrit-PatchSet: 18
Gerrit-Owner: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: d12fk <[email protected]...>
Gerrit-Comment-Date: Wed, 09 Apr 2025 13:54:44 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[Openvpn-devel] [XL] Change in openvpn[master]: win: implement --dns option support with NRPT
In reply to a message not in the archiveAttention is currently required from: plaisthos.
d12fk has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/837?usp=email )
Change subject: win: implement --dns option support with NRPT
......................................................................
Patch Set 18: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I576e74f3276362606e9cbd50bb5adbebaaf209cc
Gerrit-Change-Number: 837
Gerrit-PatchSet: 18
Gerrit-Owner: d12fk <[email protected]...>
Gerrit-Reviewer: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Comment-Date: Wed, 09 Apr 2025 14:03:48 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[Openvpn-devel] [XL] Change in openvpn[master]: win: implement --dns option support with NRPT
In reply to a message not in the archiveAttention is currently required from: plaisthos.
d12fk has removed a vote from this change. ( http://gerrit.openvpn.net/c/openvpn/+/837?usp=email )
Change subject: win: implement --dns option support with NRPT
......................................................................
Removed Code-Review+2 by d12fk <[email protected]...>
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I576e74f3276362606e9cbd50bb5adbebaaf209cc
Gerrit-Change-Number: 837
Gerrit-PatchSet: 18
Gerrit-Owner: d12fk <[email protected]...>
Gerrit-Reviewer: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-MessageType: deleteVote
PATCH v18 1/1 win: implement --dns option support with NRPT
In reply to a message not in the archiveFrom: Heiko Hund <[email protected]...>
Implement support for setting options from --dns. This is hugely different than what we had so far with DNS related --dhcp-option.
The main difference it that we support split DNS and DNSSEC by making use of NRPT (Name Resolution Policy Table). Also OpenVPN tries to keep local DNS resolution working when DNS is redirected into the tunnel. To prevent this from happening we have --block-outside-dns, in case you wonder. Basically we collect domains and name server addresses from network adapters and add so called exclude NRPT rules in addition to the catch all rule that is pushed by the server.
All is done via the interactive service, since modifying all this requires the elevated privileges that the openvpn process hopefully doesn't have.
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/837
This mail reflects revision 18 of this Change.
Acked-by according to Gerrit (reflected above):
Lev Stipakov <[email protected]...>
include/openvpn-msg.h +19 -0
@@ -35,6 +35,8 @@ msg_del_route, msg_add_dns_cfg, msg_del_dns_cfg, + msg_add_nrpt_cfg, + msg_del_nrpt_cfg, msg_add_nbt_cfg, msg_del_nbt_cfg, msg_flush_neighbors,
@@ -96,6 +98,23 @@inet_address_t addr[4 ];/* support up to 4 dns addresses */ } dns_cfg_message_t; + +typedef enum { + nrpt_dnssec +}nrpt_flags_t ; + +#define NRPT_ADDR_NUM 8/* Max. number of addresses */ +#define NRPT_ADDR_SIZE 48/* Max. address strlen + some */ +typedef char nrpt_address_t [NRPT_ADDR_SIZE ]; +typedef struct { +message_header_t header; +interface_t iface; +nrpt_address_t addresses[NRPT_ADDR_NUM ]; +char resolve_domains[512 ];/* double \0 terminated */ +char search_domains[512 ]; +nrpt_flags_t flags; +}nrpt_dns_cfg_message_t ; + typedef struct { message_header_t header; interface_t iface;
src/openvpn/dns.c +162 -0
177 lines not on this page · raw message
src/openvpn/dns.h +9 -0
@@ -26,6 +26,7 @@#include "buffer.h" #include "env_set.h" +#include "tun.h" enum dns_security {DNS_SECURITY_UNSET ,
@@ -147,6 +148,14 @@void dns_options_postprocess_pull (struct dns_options *o);/** +* Invokes the action associated with bringing DNS up or down +* @param up Boolean to set this call to "up" when true +* @param o Pointer to the program options +* @param tt Pointer to the connection's tuntap struct +*/ +void run_dns_up_down (bool up,struct options *o,const struct tuntap *tt); + +/** * Puts the DNS options into an environment set. * * @param o Pointer to the DNS options to set
src/openvpn/init.c +6 -0
@@ -2026,6 +2026,8 @@ c->c2.frame.tun_mtu, c->c2.es, &c->net_ctx); } +run_dns_up_down (true, &c->options, c->c1.tuntap); +/* run the up script */ run_up_down(c->options.up_script, c->plugins,
@@ -2064,6 +2066,8 @@/* explicitly set the ifconfig_* env vars */ do_ifconfig_setenv (c->c1.tuntap, c->c2.es); +run_dns_up_down (true, &c->options, c->c1.tuntap); +/* run the up script if user specified --up-restart */ if (c->options.up_restart) {
@@ -2152,6 +2156,8 @@ adapter_index = c->c1.tuntap->adapter_index;#endif +run_dns_up_down (false, &c->options, c->c1.tuntap); +if (force || !(c->sig->signal_received ==SIGUSR1 && c->options.persist_tun)) { static_context =NULL ;
src/openvpnserv/interactive.c +953 -30
1,192 lines not on this page · raw message
[Openvpn-devel] [PATCH applied] Re: win: implement --dns option support with NRPT
I'm not claiming to be an expert on Windows code and NRPT especially, but I've stared hard at the code and this all seems to make sense (including and especially memory and string handling). Lev tested this in detail, I just compile tested.
(The code change to openvpn itself is fairly straightforward and not that windows specific. The code change to the iservice is a tough one :-) ).
As discussed on IRC, sorry for the "%s" messup - but I would really appreciate having "code fixes" and "new code" in separate commits, as that makes reviewing & shipping the "fixes" quicker, and reviewing the "new code" easier (less lines...).
Your patch has been applied to the master branch.
commit 0f3b7d17d565a422bfddc0f393b7712031e5bdbb
Author: Heiko Hund Date: Mon Apr 14 20:06:26 2025 +0200
win: implement --dns option support with NRPT
Signed-off-by: Heiko Hund <[email protected]...>
Acked-by: Lev Stipakov <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31426.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
[Openvpn-devel] [XL] Change in openvpn[master]: win: implement --dns option support with NRPT
In reply to a message not in the archivecron2 has uploaded a new patch set (#19) to the change originally created by d12fk. ( http://gerrit.openvpn.net/c/openvpn/+/837?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by stipa
Change subject: win: implement --dns option support with NRPT
......................................................................
win: implement --dns option support with NRPT
Implement support for setting options from --dns. This is hugely different than what we had so far with DNS related --dhcp-option.
The main difference it that we support split DNS and DNSSEC by making use of NRPT (Name Resolution Policy Table). Also OpenVPN tries to keep local DNS resolution working when DNS is redirected into the tunnel. To prevent this from happening we have --block-outside-dns, in case you wonder. Basically we collect domains and name server addresses from network adapters and add so called exclude NRPT rules in addition to the catch all rule that is pushed by the server.
All is done via the interactive service, since modifying all this requires the elevated privileges that the openvpn process hopefully doesn't have.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31426.html
---
M include/openvpn-msg.h
M src/openvpn/dns.c
M src/openvpn/dns.h
M src/openvpn/init.c
M src/openvpnserv/interactive.c
5 files changed, 1,149 insertions(+), 30 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/37/837/19
include/openvpn-msg.h +19 -0
@@ -35,6 +35,8 @@ msg_del_route, msg_add_dns_cfg, msg_del_dns_cfg, + msg_add_nrpt_cfg, + msg_del_nrpt_cfg, msg_add_nbt_cfg, msg_del_nbt_cfg, msg_flush_neighbors,
@@ -96,6 +98,23 @@inet_address_t addr[4 ];/* support up to 4 dns addresses */ } dns_cfg_message_t; + +typedef enum { + nrpt_dnssec +}nrpt_flags_t ; + +#define NRPT_ADDR_NUM 8/* Max. number of addresses */ +#define NRPT_ADDR_SIZE 48/* Max. address strlen + some */ +typedef char nrpt_address_t [NRPT_ADDR_SIZE ]; +typedef struct { +message_header_t header; +interface_t iface; +nrpt_address_t addresses[NRPT_ADDR_NUM ]; +char resolve_domains[512 ];/* double \0 terminated */ +char search_domains[512 ]; +nrpt_flags_t flags; +}nrpt_dns_cfg_message_t ; + typedef struct { message_header_t header; interface_t iface;
src/openvpn/dns.c +162 -0
177 lines not on this page · raw message
src/openvpn/dns.h +9 -0
@@ -26,6 +26,7 @@#include "buffer.h" #include "env_set.h" +#include "tun.h" enum dns_security {DNS_SECURITY_UNSET ,
@@ -147,6 +148,14 @@void dns_options_postprocess_pull (struct dns_options *o);/** +* Invokes the action associated with bringing DNS up or down +* @param up Boolean to set this call to "up" when true +* @param o Pointer to the program options +* @param tt Pointer to the connection's tuntap struct +*/ +void run_dns_up_down (bool up,struct options *o,const struct tuntap *tt); + +/** * Puts the DNS options into an environment set. * * @param o Pointer to the DNS options to set
src/openvpn/init.c +6 -0
@@ -2026,6 +2026,8 @@ c->c2.frame.tun_mtu, c->c2.es, &c->net_ctx); } +run_dns_up_down (true, &c->options, c->c1.tuntap); +/* run the up script */ run_up_down(c->options.up_script, c->plugins,
@@ -2064,6 +2066,8 @@/* explicitly set the ifconfig_* env vars */ do_ifconfig_setenv (c->c1.tuntap, c->c2.es); +run_dns_up_down (true, &c->options, c->c1.tuntap); +/* run the up script if user specified --up-restart */ if (c->options.up_restart) {
@@ -2152,6 +2156,8 @@ adapter_index = c->c1.tuntap->adapter_index;#endif +run_dns_up_down (false, &c->options, c->c1.tuntap); +if (force || !(c->sig->signal_received ==SIGUSR1 && c->options.persist_tun)) { static_context =NULL ;
src/openvpnserv/interactive.c +953 -30
1,192 lines not on this page · raw message
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I576e74f3276362606e9cbd50bb5adbebaaf209cc
Gerrit-Change-Number: 837
Gerrit-PatchSet: 19
Gerrit-Owner: d12fk <[email protected]...>
Gerrit-Reviewer: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [XL] Change in openvpn[master]: win: implement --dns option support with NRPT
In reply to a message not in the archivecron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/837?usp=email )
Change subject: win: implement --dns option support with NRPT
......................................................................
win: implement --dns option support with NRPT
Implement support for setting options from --dns. This is hugely different than what we had so far with DNS related --dhcp-option.
The main difference it that we support split DNS and DNSSEC by making use of NRPT (Name Resolution Policy Table). Also OpenVPN tries to keep local DNS resolution working when DNS is redirected into the tunnel. To prevent this from happening we have --block-outside-dns, in case you wonder. Basically we collect domains and name server addresses from network adapters and add so called exclude NRPT rules in addition to the catch all rule that is pushed by the server.
All is done via the interactive service, since modifying all this requires the elevated privileges that the openvpn process hopefully doesn't have.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31426.html
---
M include/openvpn-msg.h
M src/openvpn/dns.c
M src/openvpn/dns.h
M src/openvpn/init.c
M src/openvpnserv/interactive.c
5 files changed, 1,149 insertions(+), 30 deletions(-)
include/openvpn-msg.h +19 -0
@@ -35,6 +35,8 @@ msg_del_route, msg_add_dns_cfg, msg_del_dns_cfg, + msg_add_nrpt_cfg, + msg_del_nrpt_cfg, msg_add_nbt_cfg, msg_del_nbt_cfg, msg_flush_neighbors,
@@ -96,6 +98,23 @@inet_address_t addr[4 ];/* support up to 4 dns addresses */ } dns_cfg_message_t; + +typedef enum { + nrpt_dnssec +}nrpt_flags_t ; + +#define NRPT_ADDR_NUM 8/* Max. number of addresses */ +#define NRPT_ADDR_SIZE 48/* Max. address strlen + some */ +typedef char nrpt_address_t [NRPT_ADDR_SIZE ]; +typedef struct { +message_header_t header; +interface_t iface; +nrpt_address_t addresses[NRPT_ADDR_NUM ]; +char resolve_domains[512 ];/* double \0 terminated */ +char search_domains[512 ]; +nrpt_flags_t flags; +}nrpt_dns_cfg_message_t ; + typedef struct { message_header_t header; interface_t iface;
src/openvpn/dns.c +162 -0
177 lines not on this page · raw message
src/openvpn/dns.h +9 -0
@@ -26,6 +26,7 @@#include "buffer.h" #include "env_set.h" +#include "tun.h" enum dns_security {DNS_SECURITY_UNSET ,
@@ -147,6 +148,14 @@void dns_options_postprocess_pull (struct dns_options *o);/** +* Invokes the action associated with bringing DNS up or down +* @param up Boolean to set this call to "up" when true +* @param o Pointer to the program options +* @param tt Pointer to the connection's tuntap struct +*/ +void run_dns_up_down (bool up,struct options *o,const struct tuntap *tt); + +/** * Puts the DNS options into an environment set. * * @param o Pointer to the DNS options to set
src/openvpn/init.c +6 -0
@@ -2026,6 +2026,8 @@ c->c2.frame.tun_mtu, c->c2.es, &c->net_ctx); } +run_dns_up_down (true, &c->options, c->c1.tuntap); +/* run the up script */ run_up_down(c->options.up_script, c->plugins,
@@ -2064,6 +2066,8 @@/* explicitly set the ifconfig_* env vars */ do_ifconfig_setenv (c->c1.tuntap, c->c2.es); +run_dns_up_down (true, &c->options, c->c1.tuntap); +/* run the up script if user specified --up-restart */ if (c->options.up_restart) {
@@ -2152,6 +2156,8 @@ adapter_index = c->c1.tuntap->adapter_index;#endif +run_dns_up_down (false, &c->options, c->c1.tuntap); +if (force || !(c->sig->signal_received ==SIGUSR1 && c->options.persist_tun)) { static_context =NULL ;
src/openvpnserv/interactive.c +953 -30
1,192 lines not on this page · raw message
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/837?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I576e74f3276362606e9cbd50bb5adbebaaf209cc
Gerrit-Change-Number: 837
Gerrit-PatchSet: 19
Gerrit-Owner: d12fk <[email protected]...>
Gerrit-Reviewer: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged